From 68740c9c1c46e8b7d2347598a549d6f8a32783bb Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Sat, 3 Jun 2006 14:33:08 -0600 Subject: [PATCH] [IA64] Add carriage return to printk/printf Signed-off-by: Masaki Kanno --- xen/arch/ia64/xen/acpi.c | 2 +- xen/arch/ia64/xen/dom_fw.c | 2 ++ xen/arch/ia64/xen/efi_emul.c | 5 +++-- xen/arch/ia64/xen/hypercall.c | 2 +- xen/arch/ia64/xen/process.c | 11 +++++------ xen/arch/ia64/xen/vcpu.c | 10 +++++----- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/xen/arch/ia64/xen/acpi.c b/xen/arch/ia64/xen/acpi.c index 449124820a..eb06cc78a5 100644 --- a/xen/arch/ia64/xen/acpi.c +++ b/xen/arch/ia64/xen/acpi.c @@ -629,7 +629,7 @@ acpi_boot_init (void) #ifdef CONFIG_SMP if (available_cpus == 0) { printk(KERN_INFO "ACPI: Found 0 CPUS; assuming 1\n"); - printk(KERN_INFO "CPU 0 (0x%04x)", hard_smp_processor_id()); + printk(KERN_INFO "CPU 0 (0x%04x)\n", hard_smp_processor_id()); smp_boot_data.cpu_phys_id[available_cpus] = hard_smp_processor_id(); available_cpus = 1; /* We've got at least one of these, no? */ } diff --git a/xen/arch/ia64/xen/dom_fw.c b/xen/arch/ia64/xen/dom_fw.c index c44d634359..b55a039755 100644 --- a/xen/arch/ia64/xen/dom_fw.c +++ b/xen/arch/ia64/xen/dom_fw.c @@ -943,6 +943,7 @@ dom_fw_init (struct domain *d, const char *args, int arglen, char *fw_mem, int f } printf("\n"); } else { + printf("DomainU EFI build up:"); i = 1; if ((unsigned long)fw_mem + fw_mem_size - (unsigned long)cp >= @@ -958,6 +959,7 @@ dom_fw_init (struct domain *d, const char *args, int arglen, char *fw_mem, int f printf(" ACPI 2.0=0x%lx",efi_tables[i].table); i++; } + printf("\n"); } /* fill in the SAL system table: */ diff --git a/xen/arch/ia64/xen/efi_emul.c b/xen/arch/ia64/xen/efi_emul.c index ccc8e35aee..2c7d9e4ee5 100644 --- a/xen/arch/ia64/xen/efi_emul.c +++ b/xen/arch/ia64/xen/efi_emul.c @@ -149,9 +149,10 @@ efi_emulator (struct pt_regs *regs, IA64FAULT *fault) if (current->domain == dom0) { printf("(by dom0)\n "); (*efi.reset_system)(EFI_RESET_WARM,0,0,NULL); - } - else + } else { + printf("\n"); domain_shutdown (current->domain, SHUTDOWN_reboot); + } status = EFI_UNSUPPORTED; break; case FW_HYPERCALL_EFI_GET_TIME: diff --git a/xen/arch/ia64/xen/hypercall.c b/xen/arch/ia64/xen/hypercall.c index 0f68350661..49612be900 100644 --- a/xen/arch/ia64/xen/hypercall.c +++ b/xen/arch/ia64/xen/hypercall.c @@ -168,7 +168,7 @@ fw_hypercall_ipi (struct pt_regs *regs) targ->vcpu_id, targ_regs->cr_iip); } else - printf ("arch_boot_vcpu: huu, already awaken!"); + printf ("arch_boot_vcpu: huu, already awaken!\n"); } else { int running = test_bit(_VCPUF_running, diff --git a/xen/arch/ia64/xen/process.c b/xen/arch/ia64/xen/process.c index c0441d5eef..dc24f065d7 100644 --- a/xen/arch/ia64/xen/process.c +++ b/xen/arch/ia64/xen/process.c @@ -494,7 +494,6 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa, { struct pt_regs *regs = (struct pt_regs *) &stack; unsigned long code; - char buf[128]; static const char *reason[] = { "IA-64 Illegal Operation fault", "IA-64 Privileged Operation fault", @@ -555,7 +554,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa, case 24: /* General Exception */ code = (isr >> 4) & 0xf; - sprintf(buf, "General Exception: %s%s", reason[code], + printk("General Exception: %s%s.\n", reason[code], (code == 3) ? ((isr & (1UL << 37)) ? " (RSE access)" : " (data access)") : ""); if (code == 8) { @@ -841,7 +840,7 @@ ia64_handle_reflection (unsigned long ifa, struct pt_regs *regs, unsigned long i case 26: if (((isr >> 4L) & 0xfL) == 1) { //regs->eml_unat = 0; FIXME: DO WE NEED THIS?? - printf("ia64_handle_reflection: handling regNaT fault"); + printf("ia64_handle_reflection: handling regNaT fault\n"); vector = IA64_NAT_CONSUMPTION_VECTOR; break; } #if 1 @@ -878,13 +877,13 @@ ia64_handle_reflection (unsigned long ifa, struct pt_regs *regs, unsigned long i printf("ia64_handle_reflection: handling FP trap\n"); vector = IA64_FP_TRAP_VECTOR; break; case 34: - printf("ia64_handle_reflection: handling lowerpriv trap"); + printf("ia64_handle_reflection: handling lowerpriv trap\n"); vector = IA64_LOWERPRIV_TRANSFER_TRAP_VECTOR; break; case 35: - printf("ia64_handle_reflection: handling taken branch trap"); + printf("ia64_handle_reflection: handling taken branch trap\n"); vector = IA64_TAKEN_BRANCH_TRAP_VECTOR; break; case 36: - printf("ia64_handle_reflection: handling single step trap"); + printf("ia64_handle_reflection: handling single step trap\n"); vector = IA64_SINGLE_STEP_TRAP_VECTOR; break; default: diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c index c23f384edc..64b53316b6 100644 --- a/xen/arch/ia64/xen/vcpu.c +++ b/xen/arch/ia64/xen/vcpu.c @@ -284,7 +284,7 @@ IA64FAULT vcpu_set_psr_sm(VCPU *vcpu, UINT64 imm24) if (imm.sp) { ipsr->sp = 1; psr.sp = 1; } if (imm.i) { if (vcpu->vcpu_info->evtchn_upcall_mask) { -//printf("vcpu_set_psr_sm: psr.ic 0->1 "); +//printf("vcpu_set_psr_sm: psr.ic 0->1\n"); enabling_interrupts = 1; } vcpu->vcpu_info->evtchn_upcall_mask = 0; @@ -390,7 +390,7 @@ UINT64 vcpu_get_ipsr_int_state(VCPU *vcpu,UINT64 prevpsr) UINT64 dcr = PSCBX(vcpu,dcr); PSR psr; - //printf("*** vcpu_get_ipsr_int_state (0x%016lx)...",prevpsr); + //printf("*** vcpu_get_ipsr_int_state (0x%016lx)...\n",prevpsr); psr.i64 = prevpsr; psr.ia64_psr.be = 0; if (dcr & IA64_DCR_BE) psr.ia64_psr.be = 1; psr.ia64_psr.pp = 0; if (dcr & IA64_DCR_PP) psr.ia64_psr.pp = 1; @@ -400,7 +400,7 @@ UINT64 vcpu_get_ipsr_int_state(VCPU *vcpu,UINT64 prevpsr) psr.ia64_psr.dt = 1; psr.ia64_psr.it = 1; psr.ia64_psr.rt = 1; if (psr.ia64_psr.cpl == 2) psr.ia64_psr.cpl = 0; // !!!! fool domain // psr.pk = 1; - //printf("returns 0x%016lx...",psr.i64); + //printf("returns 0x%016lx...\n",psr.i64); return psr.i64; } @@ -709,7 +709,7 @@ check_start: } // have a pending,deliverable interrupt... see if it is masked bitnum = ia64_fls(bits); -//printf("XXXXXXX vcpu_check_pending_interrupts: got bitnum=%p...",bitnum); +//printf("XXXXXXX vcpu_check_pending_interrupts: got bitnum=%p...\n",bitnum); vector = bitnum+(i*64); mask = 1L << bitnum; /* sanity check for guest timer interrupt */ @@ -721,7 +721,7 @@ check_start: goto check_start; } } -//printf("XXXXXXX vcpu_check_pending_interrupts: got vector=%p...",vector); +//printf("XXXXXXX vcpu_check_pending_interrupts: got vector=%p...\n",vector); if (*r >= mask) { // masked by equal inservice //printf("but masked by equal inservice\n"); -- 2.30.2